From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Wed, 14 Oct 2015 10:48:00 +0000 (+0200)
Subject: x86/boot: use mnemonics rather than magic numbers
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~2385
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=813ae80d82e77250dc12547cf78d50b887be62ca;p=xen.git

x86/boot: use mnemonics rather than magic numbers

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/boot/trampoline.S b/xen/arch/x86/boot/trampoline.S
index ccb40fb4d8..3452979e04 100644
--- a/xen/arch/x86/boot/trampoline.S
+++ b/xen/arch/x86/boot/trampoline.S
@@ -98,7 +98,8 @@ trampoline_protmode_entry:
 1:      wrmsr
 .Lskip_efer:
 
-        mov     $0x80050033,%eax /* hi-to-lo: PG,AM,WP,NE,ET,MP,PE */
+        mov     $(X86_CR0_PG | X86_CR0_AM | X86_CR0_WP | X86_CR0_NE |\
+                  X86_CR0_ET | X86_CR0_MP | X86_CR0_PE), %eax
         mov     %eax,%cr0
         jmp     1f
 1: